Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

systemd: disable libbpf if compiler-rt unsupported #227120

Merged
merged 1 commit into from
Apr 23, 2023

Conversation

alyssais
Copy link
Member

Description of changes

If we can't build compiler-rt, we can't have a clang for that platform. Example affected architecture: s390, which is useful for testing assumptions in Nixpkgs because it's a Linux architecture that we can't emulate.

I've written buildPackages.targetPackages.llvmPackages even though it's the same thing as llvmPackages because of the comment in this file that warns people against relying on splicing for llvmPackages. Taking llvmPackages as an input directly would make it easier for people to make that mistake without seeing the comment.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@alyssais alyssais requested a review from a team as a code owner April 19, 2023 18:48
@alyssais alyssais added the 6.topic: exotic Exotic hardware or software platform label Apr 19, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Apr 19, 2023
@flokli flokli requested review from sternenseemann and a user April 20, 2023 12:52
Copy link
Member

@sternenseemann sternenseemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe worth it to add a short note to refer to the comment for the buildPackages mess, since this instance is even more confusing.

If we can't build compiler-rt, we can't have a clang for that
platform.  Example affected architecture: s390, which is useful for
testing assumptions in Nixpkgs because it's a Linux architecture that
we can't emulate.

I've written buildPackages.targetPackages.llvmPackages even though
it's the same thing as llvmPackages because of the comment in this
file that warns people against relying on splicing for llvmPackages.
Taking llvmPackages as an input directly would make it easier for
people to make that mistake without seeing the comment.
@sternenseemann sternenseemann merged commit 513975e into NixOS:master Apr 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: exotic Exotic hardware or software platform 6.topic: systemd 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants